Fix some artefacts to demo