fixing some static scan issues