Fix c:alone bug & incorrect dealer bugs