Minor changes due to the recent merge.
Fixes due to the recent merge.