Minor fixes to last two commits.