Better support for other platforms.