Fix South migration issues. 

See commit message for detail.