Corrected some inspection warnings