misc: Post review cleanup/fixes.