DeckPicker fixes