demo body fixes