More updates to code for new 1.569 plugin version.