Fixed bugs before demo