Various fixes towards migrating the derivations to run under rel22.
Some now work - no guarantees
cc @wwalko