address a few more windows issues