Demo build fix