Fixed Tavis build and typos