Some fixes, working towards a larger job test.