Fixes for windows users