Some initial Windows fixes