Some basic fixes for the transaction controller [skip ci]