Fix some build warnings