sky2: fix PM related regressions