Version 1.2.3.6

Minor fixes