Applied fixes after class