Tweaks to better methods.
Bugs reported by Martin Morgan