Fixed compile errors in the PR