1PM fixes