solved some windows portability issues