Fixing COM-10727 and PRT-00587.