fixes for goal management