Vector fixes