Small fixes, reformats, etc.