Some updates for 6.0.0