Some widnwso tweaks