Fixed Inspection 1 Issues