[BF] Small bug fixes from going live with V3 on INEX