Fixing bugs in HybridView