Skip NULL check
Improvements to vector
Sync up with vector changes