Some more cleanup, partially fix full screen.