Fix build and style

Some minor changes to fix the build and the code style.