Additional fixes to ToVector