Add slight speed improvements for Travis-CI