Adding build fixes