Fix Approved transaction detection and silence some warnings