More hacks for non-windows systems