Small fixes after Windows compat merge