Build fixes

Fix the build, as suggested by Alcaro