Small tweaks for windows compatibility