Fix obsoletions