Visual studio fixes