Misc tidying.