Fixed some disconnect and save errors