Fix shell context