Fix up last little bit