Make examples and demos build again.