Hopefully fix windows build: Commit two files which escaped my attention. No NW.