Fix up some nonsense