Fixed minor compilation issues on nozomi