Fixes for bug #49914: Compilation breaks in trunk, and bug #48629: Trunk cannot read...