Updates with temporary build fixes.