Resolved various incorrect addresses