Minor improvements to the add policy interface