Incident #20962: Enter Receipt transaction - bug fixes and cleanup