Vector performance fixes