Improved platform support and error handling.