Fixed compile failures due to changes in portal master branch