Some version fixes I hope that will make the six dependency safe for future generations