These two are done on the same commit since Changes to Shell were annoying to make work with only one change