Attempt to fix Travis build failures