More accept/reject/confirm fixes
Merge pull request #491 from hennevogel/master

More accept/reject/confirm fixes