Versions + minor fixed