More updates RE #445