Rework OS dependncies