Fixed some (but not all) neko bugs