Final fixes before demo