I fixed this in all the places you mentioned.