Fix some six.moves