More fixes from Travis build log