Minor changes to use vec_ macros