~ fixes for RawFactory trait