Fix VS compile after recent changes