Solve compiler errors

Solve compiler errors