Static analysis motivated changes