Support fixversions

Better support for fixversions