Windows fixes (broke it with Mac)