Fix Build errors