Fix Travis compiling

Ready to be merged.