Final fixes before demo release