Fixed the macros which used to be commands