Fix source grouping.
Fix compile problem in VC.