Various updates for v2.4.0