Fixes on cell behaviour