Actually add the AVP
Fix log error