Fixing quit issues.