Fix windows compiler issues