Some minor tweaking to try and get COnsole and GUI to play nice together