%s related audit, restrict length where sensibe. Other %s cleanups.