Fixign raw transform
Fixign rest adapter hacks.