Minor fixes for gui