Fixing more version issues