Fixes from travis