Fix Build Issues