Fix Environment bugs (From Ubuntu to Windows 7)