Multiple fixes and patches