Fixed addressing issues