Bug fixes and graph dialog improvements