Misc edits to speed up init.