Windows & Version fixes