Some fixes with macros and table printing.