(360) More build fixes