Attempt to fix non-MSVC build