Fix up messed up schemes.