Fixed some issues due to incomplete code getting added in the merge.