fixes to aapi solutions