Fix up some remains