Minor fixes to make build work with Travis