Minor bug fixes and Windows 2000 support