more decrypt output fixes