Tweaks to M7 perl module