More changes to WindowManager