Effect defines, fixes