Platform compatibility improvements