A couple more Neko fixes