OP reports that the latest changes have resolved the problem.