Minor compilation fixes (VS)