PM fixes