find bugs issues fixed