Fixed cases where zip wasn't imported and where the macro is used from a different package.