Fix up results of code inspection