COMP: MSVC error
COMP: Fixing memory issues