Resolves issues with artifact location

See commit log.