[PATCH 0/2] Two <interface type='direct'/> related fixes