[M]Fixed some errors for addresses functions