Adjustments to credential handling