Tidying up win32 build