Fixed some semester issues