Non-windows changes