Add access updates from @clone1018.