Fix minor semantic warnings.