Fix shell support