Peter, at least the first one seems to be a result of your changes.

HTH,
  - Vin