Additional modifications to the Kernel and WindowManager