Loose ends before v2.0 launch