Fixing problems with last merge.