Fixes to hybrid model