Various fixes for the objective system