Fixing inspection issues