Some enh for the betaprod version