Fix up previous changes