Fixes to side-effects and loyalty