some fixes for msvc
dependency ut
style - cosmetic