Minor fixes and formatting

No real big code changes.