Further fixes for the 'export MAC in hooks' change