Fixes for cancelling holds