Finishing 0.5.0 upgrade