Shib follow-up fixes