Fixes from me and Venkat