Fixed compile fails with VS