Minor format stuff
Fixes suggested by Petr