fixes for Neko, see changelog