Fix up some stuff