Fixed issues with this morning's merge.