fixed up linux/win32 build issues