Version 2.3

Minor fixes