Fix up some errors