Added UpdateDisplayOptions to places where it should exist.