Fixing changes from the last merge.