More fixes and studios