addresses fixes