Really minimal modification for Linux integration