Fixes in Adr. Callculation