Bugfixes for artifact patch

-_-