MIGR: more performance improvements