Build fixes to fix ivy-resolve