fix compile errors; change to Vec