Some updated to make travis happy.