Repairs to compile/exec debugging output.
 merge trunk