More post-move fixing.