Multiple Vector-related fixes