further cleanup of missed migration issues