Code audit changes part 3

/cc @JonRowe