Fixed vector arguments and snapshot bugs