Fixes to discard move