Fix up ensure some more