Some fixes waiting for iheartziba