Change setup logic slightly to accomodate travis builds