Fix some settings.
Misc tidying.