Fixed issues with last merge.