MX-1258, address some CR comments