FIX: Fixes for Windows