Fixed bugs before class starts.