A few more bug fixes in policy rules

Change-Id: Ib2829263a5277aad0649512e521a426b9bc2fe5e