Affordability Service - bug fixes