Fixed some issues in studio