Bugfixes for artifact fix

-_-