Minor fixes in effect, etc