More tweaks to deck and discard pile