Fixes to avoid unusual compiler bug.