Small fixes

Change-Id: I8b689d24c3002c46b372661cc3357e1680bdb340
Explicitly return the policies, now that it's a join in the db

Change-Id: Ib57032ed4650676d4c14233954f17cf7e7429e0c