UP: Got most bad stuff in code-analysis fixed