last updates before attempting 0.9.0 migration