Fixed macro support and autoupdater