Fixing errors related to last 2 commits.