Tried to fix an incompatibility with Dan's windows install and removed a problem for unix build.