Linux fix fix
Windows fixes