Fix PP additional hangs and categorization improvements