Some insight fixes