Fixing code inspection warnings