South migrations and some fixes