Code: Analysis fixes