Thanks! I believe both issues were already addressed on the beta (when using it in conjunction with fop2 freepbx module).
There are also some old installations out there that still require zap. So this solution will not fit everyone. And the autoconfig scripts are actually script so people can tweak them as you did.
