Fix issues on Travis