audit and inspect fixes