Fix the transactional adapter

+ some additional quick fixes