small fixes and tweaks to deal with separated vectors