bol-van minor source fixes