various changes due to change to Vec