pm6 fixes