Some changes because of licensing issues