Various cell dialog fixes...