Updated for non-windows paths