Windows compatibiity changes