VIVO-387: clean up post-migration issues