Adjustments for hybrid - it should compile now
Renaming in progress, fixup for bug #40