Several bug fixes to the CM11A module.