Some fixes & vercmp
More fixes.