Further Migration

Some things I missed first time around