some fixes after merge with 3.0.22 PRO