Fixed static code errors