More minor fixes for multiprocessing