More dep fixes (for MSVC & clang)