Sandbox build updates