Some small patches to fix bad effects