Fixed code errors left from migration.