Fixes to make the demos work.