various bugfixes added policies

Change-Id: I3c3e7d4b28ec8323fbc1f802ff864c53858f79c2