Fixup: Studio server-side - review comments.