Update Sandbox with latest fixes