Fixed bugs before standup