NOJIRA: Fixing misc compilation and build problems.