Misc hybrid fixes
Merge pull request #315 from khawkins/misc_hybrid_fixes

Misc hybrid fixes