Additional fixes to last merge.