Fix a number of inspection warnings (no functional changes)