Deck Fixes