Fix code inspection problems