GUIController: Merged fixes by Ivan Tsantsarov