Minor changes to make travis pass.

Also some fixes to minor linting issues.

No ticket.