speed up and fix travis build