Fixing issues after merge.