Fixes around cell rendering