Some changes that will hopefully make the Travis-CI build work.