Fix build, formatting

Careful, contributors...