Fix the transactional adapter

+ some additional quick fixes
Merge pull request #82 from iNecas/fix-transactional-adapter

Fix the transactional adapter