Bug fixes from transactions.