Fixed inspection issues