Avi quick fixes