(360) Some build fixes