Avatar effect fixes