JH's Feb 28th fixes...