Fix the build + 2 minor fixes