Add safe job submit and bug fixes