Fixed static code check failures