Ninja: some small changes