Added fixes and dialog controls.