Fixed some inspection issues