Bug fixes and dealer behavior