Fixing problems similar to #231 in Zone Effects, and Function modals.