fix remaining validation issues