Fix remaining pid type refactoring