Ninja fix a bunch of things