Remove some semantic warnings