Does anyone have a mod that fixes high school years bugs?

Ive been getting several bugs all relating to highschool years dlc, i have two examples: Only option is leave early when clicking work type

When I do click leave early my sims goes back to the lot but his icon shows that hes still at school

One time my sim was stuck in high school and i couldnt get him to leave, no option for leavy early either.