Performance fixes and ensure cells are added correctly from whatever context.