Deck fixes