Fix setups for Circle and Travis CI