Fixed some build issue