more windows related fixes