fixing find bugs issues