Tweaks to policy model

Change-Id: Iea28b7100f67418502938e31d7a3ece37be5c55a
Signed-off-by: Rob Adams <readams@readams.net>