Wrap up Windows side for 0.98 release