Further attempts at making travis build pass.