Fixed compiler errors
id changes