Minor updates.
Fixed merge issue