Additional fixes for undo/drain process
Crapload of fixes around the undo process for drains. Process type wasn't properly being set and carried so I've centralized that for safety. Other bug fixes around drain undo actions.