More fixes to hybrid model