WHT-31 - Changes to fix errors noticed in review