Fix shell errors