Fixes for windows paths