v 1.2.3.6 minor fixes