- Further changes to issues that came to light after pull #3