Code style
Some more post-merge fixes