Updates to get SA Policies to work on dev