Fixed QA issues in Controller Artist