fixes from migration testing session