Start fixing zimbra pack macros