(360) Some build fixes - still broken