Fixing plots and macros