r4968: Fixes for 0compile (Thomas Leonard):