some fixes for the address refactoring #bugfix