Static analysis fixes.
Fix more goddamn complaints
More static happiness