ci: followup merge fixes for travis