Fixing prev build errors

Fixing prev build errors