Tweaks to the M7 perl module