Bugfixes to saving, macro editor.