Fixing version issues