Small tweaks for better windows functionality