Remove some build warnings