Add some additions to Griffin for MSVC PC build