Fix function call
Fix addresses