fixing up some windows issues