Fix policy calls