minor updates to help this work on Windows