Fixes for the studio