Fix windows again.. most have been lost in a merge