Minor fixes to vectorizer