Even more cell dialog fixes