Include deregistration dates, fix types