Fix up adaptors.