Fixed demos to support 1.1