MX-1274, Address some CR comments