Fixes for renewals generation