Changes to make all effects compilable together