Added utils and cleaned up some Windows specific stuff