various fixes: see V2_2_5_pre5 release notes in ReleaseNotes.txt