Fixes per Max's comments.