Remove some extra warnings