Fixes for windows?