Fixes for gui