some fixes

collection of local patches
Aah now I see.