Backport v4 Style fixes for VS Manager