Fix 8 confirmed issues from static-review investigation