More updates to try and resolve issues.