Some changes for visualstudio