Bug fixes to address checking.