small debug fixes for VERSION_NONE mapping (see last commit)