Improve compatibility with previous releases