Update and new build fixes