Correcting some issues before demo release