normalize fixes, windows support