Some changes to compiler