Fix compiler warnings and build

This CVS thing could be dropped isn't it ?