Small fixes in demo configuration