Fixed some more references