Move the transaction to fix failing tests
Remove some ruby warnings