A few machine-specific fixes