Fixed Travis issues