Fixes for @parkr comments.