Apple-specific fixes.