More Fixes for Avi