Fixed up some minor issues with the ScaleVC refactor