Fix demo options, fixes #195