Cleaned up south migration merge issues