Remove some other remaining warnings