Fixes with static analysis (which sucks here)