Small tweaks to the effect system