Fix some things up for the travis build