Fix lint complaints from TravisCI