more updates/obsoletes for updating compat for 2.5