Adding fixes for renewals