Fixed stuff to work for both win and linux