Add guards for MSVC and comments