Policy patches off of latest policy.

nscd fixes mainly.