Fix Travis after Makefile rejigger