Fix windows compilation for filling in missing fields, #1