Fix/misc mark

With these additional changes I can create a vagrant image with the pipeline.

Now also replicated on a VM on the HPCCloud with enough memory.