Fixes for null pointers in job config