Fix version conflicts we were hitting with six