Some formatting fixes so docs will build, etc.