Improved support for multiple OS platforms