Inspect fixes