Update due to HSBC changes.
More updates due to HSBC update.