Client fixes and Windows support