student side fixes