Hotfixes

Add a fix for
https://github.com/ControlSystemStudio/cs-studio/issues/215