2.2.6, some fixes