- fixes in NTAP and transaction layer