changes that might improve transactional/NPE issues