Few more tweaks to the M7 perl module