Multiple fixes to the release24 branch