Compile after rebase changes

- Compile after rebase changes.