small rfmapper fixes