Random bug fixes from the ATA# switch.