Fixes for changes in based PR.