Fix Ninja/Sciz bugs