Build Errors Fixed