#42: Fixed static analysis errors.