Fixed find bugs issues