FIX: windows comp issues