Fix up more windows errors