GPAUDITLOGGING-48 - Fix various issues; cleanup