artf230740: more fixes