Fix some addressing bugs