Fixed issues highlighted by the new checks Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
Signed-off-by: Puneet Pruthi <puneetpruthi@gmail.com>