fixed more errors related to recent pull request merges in the window dev scripts