More fixes on shell output