* Fixes ported from trunk: