Fix up some helper programs