Demo language fixes