Auditing and minor changes to membership scaffold