BF: fixes from first travis run