Fixes following Travis