Fix Build Errors