Fixes needed based on CM changes