More ezra fixes.