BITV 2: fixed some validation issues