Fix build for current HEADS

Minor cleanups with current oe heads.

Apart of these small changes it was a (up to now) unique experience to see so many things working 'out of the box' - thanks for doing this layer

Andreas