clean up remaining version-related failures