Fixed Travis build issues