Fixes for addressing