more deck fixes