Fix before demo release