Fixing a few addressing issues