Some fixes to make cat 6 and cat 7 work