Various fixes for performing deposit handoff