PM schema fixes