Daily commit.  Fixed several issues for windows users