Cleanup, GuiScreen parent NPE fix