Fix build and add some derivations while at it