More identity tweaks