Post 2.3.0, also minor touchups