various nits fixes on prefixing