Fix Build issues