Initial + fixes for 'cd' command. Wish I didn't have to special-case like this.