Some simple fixes to make sure that we don't queue txns twice