Improve system compatibility