Fixes to resolve issues after merge.