BF: more fixes from travis errors