Fixed win issue.
Minor bug fixes.