Fixing bugs related to the previous commits.