Fixes in the deck module