Various fixies.
More win fixes.