Temporary fixes for tmp program,

but need to plan for longer-term with other test programs