bugfixes for Neko

Thanks for the fixes !
For this one, I don't understand how it relates to neko, since this class is not supposed to be included in a neko build.