Add some minor VPI/ACC fixes and updates

These were submitted.