Small fixes for GUI