more changes to support windows 2008