Shell's fixes