Minor bug fixes

Formatting