Fixes following Travis build