fix pmm & some other trifles