Fixed double self-reference and deprecated overlay function in PR2 overlay

Just some minor issues I found on the way ...