More code inspections updates, correct some errors from previous fixes