vl: morefixes to Luc's patch