Small tweaks

Fix build (on Linux) and first test suite run.