fix ups to get windows compiling again...