Fixes for building with optional libHaru.