Fixed some static code errors