Fixed additional .cross migration errors

Discovered one more .cross migration error and some improvements