some minor changes

It's a little hard to test but 8c2cec4 probably fixes #7