A bunch of little fixes
Merge pull request #23 from Naosyth/bw-fix-analyzer-issues

A bunch of little fixes