Last of the changes that should fix #1