Misc updates for consistency.