Fixed some issues with the dealer functionality