Fixes all the remaining shell bugs.