Further compiler fixes.