Backporting bug fixes