Build fix plus future travis update