GUI: clean up, fix warnings