1.2.6 small fixes 2