fixes for windows; #19