Fixes for the GUI