CV's Fixes

Added CV's Fixes as optional pieces.