More conversion to FR_CONF_OFFSET
More conversion to FR_CONF_OFFSET

and fix up the various dependent data types