Some fixes to make travis work again