Fix memory leak in effects
Slight cleanup of various commits ;; -> ;
Merge branch 'bugfixes'