Release 2.3 fixes. Bug #1. Bug#22.