Study manager fixes