Minor fixes for policy decision point