Fixes for the gui.