Fix some more hard coded vector/cache widths