Ninja-cat fixes

Change-Id: Ica9c6f471f169e94bf8fbe896bbbdccf0a1f931e