And some more 10.5.8 compat fixes.