Fixed some addressing bugs in new code.