Fix NOT_FOUND and move to long long