Minor changes to objective fns