1108 af 1 fixes and tests