Fixes to GUI reference bugs

Merged Markus Scheidgen requested to merge hotfixes into develop

Merge request reports