Some minor vapi fixes