Fixed ninja bugs