Vector import fixes