Changes to internal logging code + improvements to handling familiars during automation