Addes some OS related fixes.