Fixes after merge PDT master into fork