More fixing-up before the big stuff hits...