Small fixes after testing GUI.