Demo file fixes.