Fixing bugs caused by merge requests.