Fix some build errorrs