Updates to get travis working