Added missing changes from Cespy