Applies some fixes already fixes in other versions