Ninja build system fixes.