Changes to fix error and appease closure.