Fix Non-Interactive Shell Issues