Minor WIndows fixes