Fix code imnspection issues