Build Errors solved