fixes to get studio working