Fix vet errors

This port of fixes from dotcloud/docker#6269