FIX: Fixes for x64 windows