Fixed some, but not all