More minor changes to attempt to debug pushing the window to the front.