More WrinklyNinja fixes