Fixed build + some small improvements for the demos