Fixing issues after PR merge.