Chris fixes for task 84732228