Fixed static analysis issues