My fixes thus far