Fixes for windows (again).