Repair errors from #5