Fixed up the platform support with the new modules.